From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 23 Jul 2011 12:15:53 +0000 (-0400)
Subject: Fix compilation with GLYPH_DEBUG.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2735
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=92a2fa84247665ccf558da523ecfe7d84abdaf54;p=emacs.git

Fix compilation with GLYPH_DEBUG.

 src/xfns.c (unwind_create_frame) [GLYPH_DEBUG]: Adapt to changes in
 revision 84777 on 2008-02-22.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b5f11a2cd60..db5026955ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-23  Eli Zaretskii  <eliz@gnu.org>
 
+	* xfns.c (unwind_create_frame) [GLYPH_DEBUG]: Adapt to changes in
+	revision 84777 on 2008-02-22.
+
 	* xdisp.c (move_it_in_display_line_to): Record the best matching
 	position for TO_CHARPOS while scanning the line, and restore it on
 	exit if none of the characters scanned was an exact match.  Fixes
diff --git a/src/xfns.c b/src/xfns.c
index 0d1e4a1bb5e..eec19b9d275 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2933,7 +2933,7 @@ unwind_create_frame (Lisp_Object frame)
 #if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
       xassert (dpyinfo->reference_count == dpyinfo_refcount);
-      xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
+      xassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
 #endif
       return Qt;
     }